From a68b530fa7ae37c5048a965850f565d2764ce9e5 Mon Sep 17 00:00:00 2001 From: Alastair Tse Date: Thu, 25 Jan 2007 11:58:00 +0000 Subject: [PATCH] [XEND] Allow TCP XMLRPC address:port to be configured, if enabled. Signed-off-by: Alastair Tse --- tools/examples/xend-config.sxp | 6 ++++++ tools/python/xen/xend/XendOptions.py | 12 ++++++++++++ tools/python/xen/xend/server/SrvServer.py | 5 ++++- 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/tools/examples/xend-config.sxp b/tools/examples/xend-config.sxp index 71d30bceb9..a229ccd43f 100644 --- a/tools/examples/xend-config.sxp +++ b/tools/examples/xend-config.sxp @@ -59,6 +59,12 @@ #(xend-unix-path /var/lib/xend/xend-socket) +# Address and port xend should use for the TCP XMLRPC interface, +# if xen-tcp-xmlrpc-server is set. +#(xen-tcp-xmlrpc-server-address 'localhost') +#(xen-tcp-xmlrpc-server-port 8006) + + # Port xend should use for the HTTP interface, if xend-http-server is set. #(xend-port 8000) diff --git a/tools/python/xen/xend/XendOptions.py b/tools/python/xen/xend/XendOptions.py index 25020023bb..c220af0c6e 100644 --- a/tools/python/xen/xend/XendOptions.py +++ b/tools/python/xen/xend/XendOptions.py @@ -60,6 +60,10 @@ class XendOptions: xend_tcp_xmlrpc_server_default = 'no' + xend_tcp_xmlrpc_server_address_default = 'localhost' + + xend_tcp_xmlrpc_server_port_default = 8006 + xend_unix_xmlrpc_server_default = 'yes' """Default interface address xend listens at. """ @@ -155,6 +159,14 @@ class XendOptions: return self.get_config_bool("xend-tcp-xmlrpc-server", self.xend_tcp_xmlrpc_server_default) + def get_xend_tcp_xmlrpc_server_port(self): + return self.get_config_int("xend-tcp-xmlrpc-server-port", + self.xend_tcp_xmlrpc_server_port_default) + + def get_xend_tcp_xmlrpc_server_address(self): + return self.get_config_string("xend-tcp-xmlrpc-server-address", + self.xend_tcp_xmlrpc_server_address_default) + def get_xend_unix_xmlrpc_server(self): return self.get_config_bool("xend-unix-xmlrpc-server", self.xend_unix_xmlrpc_server_default) diff --git a/tools/python/xen/xend/server/SrvServer.py b/tools/python/xen/xend/server/SrvServer.py index 937c67a250..26c045e747 100644 --- a/tools/python/xen/xend/server/SrvServer.py +++ b/tools/python/xen/xend/server/SrvServer.py @@ -204,7 +204,10 @@ def _loadConfig(servers, root, reload): log.error('Xen-API server configuration %s is invalid.', api_cfg) if xoptions.get_xend_tcp_xmlrpc_server(): - servers.add(XMLRPCServer(XendAPI.AUTH_PAM, False, True)) + addr = xoptions.get_xend_tcp_xmlrpc_server_address() + port = xoptions.get_xend_tcp_xmlrpc_server_port() + servers.add(XMLRPCServer(XendAPI.AUTH_PAM, False, use_tcp = True, + host = addr, port = port)) if xoptions.get_xend_unix_xmlrpc_server(): servers.add(XMLRPCServer(XendAPI.AUTH_PAM, False)) -- 2.30.2